removed various old cRIO stuff
diff --git a/aos/common/die.cc b/aos/common/die.cc
index 0ea7007..4c579cd 100644
--- a/aos/common/die.cc
+++ b/aos/common/die.cc
@@ -7,11 +7,10 @@
#include <unistd.h>
#include <string.h>
#include <signal.h>
+#include <stdint.h>
#include <string>
-#include "aos/aos_stdint.h"
-
namespace aos {
void Die(const char *format, ...) {
diff --git a/aos/common/inttypes.h b/aos/common/inttypes.h
deleted file mode 100644
index a96130f..0000000
--- a/aos/common/inttypes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef AOS_COMMON_INTTYPES_H_
-#define AOS_COMMON_INTTYPES_H_
-
-// This file is here because the vxworks headers do not have an inttypes.h file
-// and being able to print out fixed size types is very useful. Any fixed size
-// formats that we need on the cRIO should get added here.
-
-#ifndef __VXWORKS__
-#include <inttypes.h>
-#else
-#define PRId64 "lld"
-#define PRIu64 "llu"
-
-// It warns about just "d", but not this, which is kind of weird because
-// sizeof(int) == sizeof(long) == sizeof(int32_t) == 4, but oh well.
-#define PRId32 "ld"
-#define PRIx32 "lx"
-#define PRIu32 "lu"
-
-#define PRIu16 "hu"
-#endif
-
-#endif // AOS_COMMON_INTTYPES_H_
diff --git a/aos/common/libstdc++/README b/aos/common/libstdc++/README
deleted file mode 100644
index df8269e..0000000
--- a/aos/common/libstdc++/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains replacement include files for ones that the libstdc++ we're using on the cRIO either don't implement completely or doesn't have at all.
-The ones in aos/crio/libstdc++ are copied from the libstdc++ that came with the compiler and tweaked so that they work.
-When used for compiles not for vxworks, they just #include the usual standard library header.
diff --git a/aos/common/libstdc++/memory b/aos/common/libstdc++/memory
deleted file mode 100644
index 31ab6e9..0000000
--- a/aos/common/libstdc++/memory
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <memory>
-#ifdef __VXWORKS__
-#include "aos/crio/libstdc++/unique_ptr.h"
-#endif
diff --git a/aos/common/libstdc++/type_traits b/aos/common/libstdc++/type_traits
deleted file mode 100644
index ada2002..0000000
--- a/aos/common/libstdc++/type_traits
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef __VXWORKS__
-#include "aos/crio/libstdc++/type_traits"
-#else
-#include <type_traits>
-#endif
diff --git a/aos/common/libstdc++/utility b/aos/common/libstdc++/utility
deleted file mode 100644
index 50b8aa3..0000000
--- a/aos/common/libstdc++/utility
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <utility>
-#ifdef __VXWORKS__
-#include "aos/crio/libstdc++/move.h"
-#endif
diff --git a/aos/common/logging/logging_impl.cc b/aos/common/logging/logging_impl.cc
index e7b0a5e..5c5dfc4 100644
--- a/aos/common/logging/logging_impl.cc
+++ b/aos/common/logging/logging_impl.cc
@@ -4,7 +4,7 @@
#include <stdarg.h>
#include "aos/common/time.h"
-#include "aos/common/inttypes.h"
+#include <inttypes.h>
#include "aos/common/once.h"
#include "aos/common/queue_types.h"
#include "aos/common/logging/logging_printf_formats.h"
diff --git a/aos/common/logging/logging_impl_test.cc b/aos/common/logging/logging_impl_test.cc
index 58b7b00..dea1815 100644
--- a/aos/common/logging/logging_impl_test.cc
+++ b/aos/common/logging/logging_impl_test.cc
@@ -5,7 +5,7 @@
#include "aos/common/logging/logging_impl.h"
#include "aos/common/time.h"
#include "aos/common/die.h"
-#include "aos/common/inttypes.h"
+#include <inttypes.h>
using ::testing::AssertionResult;
using ::testing::AssertionSuccess;
diff --git a/aos/common/network_port.h b/aos/common/network_port.h
index c19c2ce..b523674 100644
--- a/aos/common/network_port.h
+++ b/aos/common/network_port.h
@@ -1,7 +1,7 @@
#ifndef AOS_COMMON_NETWORK_PORT_H_
#define AOS_COMMON_NETWORK_PORT_H_
-#include "aos/aos_stdint.h"
+#include <stdint.h>
namespace aos {
diff --git a/aos/common/queue.cc b/aos/common/queue.cc
index b3a4799..893e62b 100644
--- a/aos/common/queue.cc
+++ b/aos/common/queue.cc
@@ -1,7 +1,7 @@
#include "aos/common/queue.h"
#include "aos/common/byteorder.h"
-#include "aos/common/inttypes.h"
+#include <inttypes.h>
namespace aos {
diff --git a/aos/common/time.cc b/aos/common/time.cc
index ced0c4d..8a44010 100644
--- a/aos/common/time.cc
+++ b/aos/common/time.cc
@@ -7,7 +7,7 @@
#include <string.h>
#include "aos/common/logging/logging.h"
-#include "aos/common/inttypes.h"
+#include <inttypes.h>
#include "aos/common/mutex.h"
namespace aos {
diff --git a/aos/common/time.h b/aos/common/time.h
index ca1d207..1dc1def 100644
--- a/aos/common/time.h
+++ b/aos/common/time.h
@@ -3,17 +3,12 @@
#include <stdint.h>
#include <time.h>
-
-#ifndef __VXWORKS__
-#include <type_traits>
#include <sys/time.h>
-#else
-#include <sysLib.h>
-#include <sys/times.h>
-#endif
+#include <stdint.h>
+
+#include <type_traits>
#include <ostream>
-#include "aos/aos_stdint.h"
#include "aos/common/type_traits.h"
namespace aos {
diff --git a/aos/common/type_traits.h b/aos/common/type_traits.h
index 4ce6af4..45222e7 100644
--- a/aos/common/type_traits.h
+++ b/aos/common/type_traits.h
@@ -1,7 +1,7 @@
#ifndef AOS_COMMON_TYPE_TRAITS_
#define AOS_COMMON_TYPE_TRAITS_
-#include "aos/common/libstdc++/type_traits"
+#include <type_traits>
namespace aos {