diff --git a/src/Arduino_AVRSTL.cpp b/src/Arduino_AVRSTL.cpp
index 3c00976..ad8bc10 100644
--- a/src/Arduino_AVRSTL.cpp
+++ b/src/Arduino_AVRSTL.cpp
@@ -1,4 +1,4 @@
-#include <Arduino_AVRSTL.h>
+#include "Arduino_AVRSTL.h"
 #include <Arduino.h>
 
 //
diff --git a/src/Arduino_AVRSTL.h b/src/Arduino_AVRSTL.h
index b729f79..d692afa 100644
--- a/src/Arduino_AVRSTL.h
+++ b/src/Arduino_AVRSTL.h
@@ -9,8 +9,8 @@
 #ifndef ARDUINOSTL_M_H
 #define ARDUINOSTL_M_H
 
-#include "Arduino.h"
-#include <serstream>
+#include <Arduino.h>
+#include "serstream"
 
 // Create cout and cin.. there doesn't seem to be a way
 // to control what serial device at runtime. Grr.
diff --git a/src/abi/abi.cpp b/src/abi/abi.cpp
index ecc2048..94f966c 100644
--- a/src/abi/abi.cpp
+++ b/src/abi/abi.cpp
@@ -17,9 +17,9 @@
 	USA.
 */
 
-#include <cstdlib>
-#include <typeinfo>
-#include <basic_definitions>
+#include "cstdlib"
+#include "typeinfo"
+#include "basic_definitions"
 
 /* This file implements a number of the language support features
  * needed to deal with the C++ abi, as originally documented in the
diff --git a/src/algorithm b/src/algorithm
index 5240349..1e981d7 100644
--- a/src/algorithm
+++ b/src/algorithm
@@ -15,10 +15,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <cstdlib>
-#include <iterator>
-#include <utility>
-#include <functional>
+#include "cstdlib"
+#include "iterator"
+#include "utility"
+#include "functional"
 
 #ifndef __STD_HEADER_ALGORITHM
 #define __STD_HEADER_ALGORITHM 1
diff --git a/src/algorithm.cpp b/src/algorithm.cpp
index e21b14e..74ba15c 100644
--- a/src/algorithm.cpp
+++ b/src/algorithm.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <algorithm>
+#include "algorithm"
 
 
 namespace std{
diff --git a/src/array b/src/array
index 094ecf9..ce4ab00 100644
--- a/src/array
+++ b/src/array
@@ -1,8 +1,8 @@
 #ifndef __ARRAY__
 #define __ARRAY__
 
-#include <cstddef>
-#include <initializer_list>
+#include "cstddef"
+#include "initializer_list"
 
 namespace std {
 
diff --git a/src/associative_base b/src/associative_base
index 27ae0ef..62a162a 100644
--- a/src/associative_base
+++ b/src/associative_base
@@ -18,11 +18,11 @@
 
 
 
-#include<memory>
-#include<utility>
-#include<iterator>
-#include<functional>
-#include<list>
+#include "memory"
+#include "utility"
+#include "iterator"
+#include "functional"
+#include "list"
 
 
 #ifndef __STD_HEADER_ASSOCIATIVE_BASE
diff --git a/src/associative_base.cpp b/src/associative_base.cpp
index cc2d20e..583ae46 100644
--- a/src/associative_base.cpp
+++ b/src/associative_base.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include <associative_base>
+#include "associative_base"
 
 namespace std{
 
diff --git a/src/basic_definitions b/src/basic_definitions
index d4b6cd5..40e4a4b 100644
--- a/src/basic_definitions
+++ b/src/basic_definitions
@@ -18,7 +18,7 @@
 #ifndef __BASIC_DEFINITIONS
 #define __BASIC_DEFINITIONS 1
 
-#include <system_configuration.h>
+#include "system_configuration.h"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/bitset b/src/bitset
index 50d5404..bdc30dd 100644
--- a/src/bitset
+++ b/src/bitset
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <cstddef>
-#include <climits>
-#include <func_exception>
-#include <string>
-#include <iosfwd>
+#include "basic_definitions"
+#include "cstddef"
+#include "climits"
+#include "func_exception"
+#include "string"
+#include "iosfwd"
 
 #ifndef __STD_BITSET_HEADER
 #define __STD_BITSET_HEADER 1
diff --git a/src/bitset.cpp b/src/bitset.cpp
index f1ece31..acd881b 100644
--- a/src/bitset.cpp
+++ b/src/bitset.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include <bitset>
+#include "bitset"
 
 namespace std{
 
diff --git a/src/char_traits b/src/char_traits
index 36eae36..99a5490 100644
--- a/src/char_traits
+++ b/src/char_traits
@@ -16,14 +16,14 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 #include <string.h>
-#include <exception>
-#include <memory>
+#include "exception"
+#include "memory"
 
 #ifdef __UCLIBCXX_HAS_WCHAR__
-#include <cwchar>
-#include <cwctype>
+#include "cwchar"
+#include "cwctype"
 #endif
 
 #ifndef __HEADER_CHAR_TRAITS
diff --git a/src/char_traits.cpp b/src/char_traits.cpp
index 2a91bd9..e5030ad 100644
--- a/src/char_traits.cpp
+++ b/src/char_traits.cpp
@@ -21,8 +21,8 @@
 #define __UCLIBCXX_COMPILE_CHAR_TRAITS__ 1
 
 
-#include <basic_definitions>
-#include <char_traits>
+#include "basic_definitions"
+#include "char_traits"
 
 namespace std{
 
diff --git a/src/complex b/src/complex
index 61e489e..b737180 100644
--- a/src/complex
+++ b/src/complex
@@ -17,8 +17,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <istream>
-#include <ostream>
+#include "istream"
+#include "ostream"
 
 #ifndef __STD_HEADER_COMPLEX
 #define __STD_HEADER_COMPLEX 1
diff --git a/src/complex.cpp b/src/complex.cpp
index 6b895a8..764b0c2 100644
--- a/src/complex.cpp
+++ b/src/complex.cpp
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <complex>
+#include "complex"
 
 
 namespace std{
diff --git a/src/cstdio b/src/cstdio
index 8f4df27..aa38877 100644
--- a/src/cstdio
+++ b/src/cstdio
@@ -16,7 +16,7 @@
 */
 
 #include <stdio.h>
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef __HEADER_CSTDIO
 #define __HEADER_CSTDIO 1
diff --git a/src/cstdlib b/src/cstdlib
index e45261a..0114824 100644
--- a/src/cstdlib
+++ b/src/cstdlib
@@ -17,7 +17,7 @@
 */
 
 #include <stdlib.h>
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef __HEADER_CSTDLIB
 #define __HEADER_CSTDLIB 1
diff --git a/src/cstring b/src/cstring
index de8589b..e40c11d 100644
--- a/src/cstring
+++ b/src/cstring
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <cstddef>
+#include "cstddef"
 #include <string.h>
 
 #ifndef __HEADER_CSTRING
diff --git a/src/ctime b/src/ctime
index 1b4c09b..136d71b 100644
--- a/src/ctime
+++ b/src/ctime
@@ -46,7 +46,7 @@
 
 #pragma GCC system_header
 
-#include <cstddef>
+#include "cstddef"
 
 #include <time.h>
 
diff --git a/src/cwchar b/src/cwchar
index 03fae09..6a851e4 100644
--- a/src/cwchar
+++ b/src/cwchar
@@ -16,7 +16,7 @@
 */
 
 #include <wchar.h>
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef __HEADER_CWCHAR
 #define __HEADER_CWCHAR 1
diff --git a/src/del_opnt.cpp b/src/del_opnt.cpp
index 96cb03b..71627bb 100644
--- a/src/del_opnt.cpp
+++ b/src/del_opnt.cpp
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <new>
-#include <cstdlib>
-#include <func_exception>
+#include "new"
+#include "cstdlib"
+#include "func_exception"
 
 #ifndef NO_NOTHROW
 _UCXXEXPORT void operator delete(void* ptr, const std::nothrow_t& ) throw() {
diff --git a/src/del_ops.cpp b/src/del_ops.cpp
index e292b03..3c7d413 100644
--- a/src/del_ops.cpp
+++ b/src/del_ops.cpp
@@ -18,9 +18,9 @@
 */
 /* C++14 sized deallocation */
 
-#include <new>
-#include <cstdlib>
-#include <func_exception>
+#include "new"
+#include "cstdlib"
+#include "func_exception"
 
 _UCXXEXPORT void operator delete(void* ptr, std::size_t) throw(){
 	::operator delete (ptr);
diff --git a/src/del_opvnt.cpp b/src/del_opvnt.cpp
index f2a2a36..27ba445 100644
--- a/src/del_opvnt.cpp
+++ b/src/del_opvnt.cpp
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <new>
-#include <cstdlib>
-#include <func_exception>
+#include "new"
+#include "cstdlib"
+#include "func_exception"
 
 #ifndef NO_NOTHROW
 _UCXXEXPORT void operator delete[](void* ptr, const std::nothrow_t& ) throw(){
diff --git a/src/del_opvs.cpp b/src/del_opvs.cpp
index 1c92d1f..aa22016 100644
--- a/src/del_opvs.cpp
+++ b/src/del_opvs.cpp
@@ -18,9 +18,9 @@
 */
 /* C++14 sized deallocation */
 
-#include <new>
-#include <cstdlib>
-#include <func_exception>
+#include "new"
+#include "cstdlib"
+#include "func_exception"
 
 _UCXXEXPORT void operator delete[](void * ptr, std::size_t) throw(){
 	::operator delete[] (ptr);
diff --git a/src/deque b/src/deque
index ff07ab5..80dd94b 100644
--- a/src/deque
+++ b/src/deque
@@ -17,9 +17,9 @@
 */
 
 
-#include <memory>
-#include <iterator>
-#include <stdexcept>
+#include "memory"
+#include "iterator"
+#include "stdexcept"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/deque.cpp b/src/deque.cpp
index c515580..2842a83 100644
--- a/src/deque.cpp
+++ b/src/deque.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include <deque>
+#include "deque"
 
 
 namespace std{
diff --git a/src/eh_alloc.cpp b/src/eh_alloc.cpp
index cdf28e0..6310f33 100644
--- a/src/eh_alloc.cpp
+++ b/src/eh_alloc.cpp
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <cstdlib>
-#include <cstring>
-#include <func_exception>
+#include "cstdlib"
+#include "cstring"
+#include "func_exception"
 
 //This is a system-specific header which does all of the error-handling management
-#include <unwind-cxx.h>
+#include "unwind-cxx.h"
 
 namespace __cxxabiv1
 {
diff --git a/src/eh_globals.cpp b/src/eh_globals.cpp
index 38d4583..bac0bc2 100644
--- a/src/eh_globals.cpp
+++ b/src/eh_globals.cpp
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <cstdlib>
-#include <cstring>
-#include <func_exception>
+#include "cstdlib"
+#include "cstring"
+#include "func_exception"
 
 //This is a system-specific header which does all of the error-handling management
-#include <unwind-cxx.h>
+#include "unwind-cxx.h"
 
 //The following functionality is derived from reading of the GNU libstdc++ code and making it...simple
 
diff --git a/src/exception b/src/exception
index bdf393e..38b6dae 100644
--- a/src/exception
+++ b/src/exception
@@ -37,7 +37,7 @@
 #ifndef __EXCEPTION__
 #define __EXCEPTION__
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 extern "C++" {
 
diff --git a/src/exception.cpp b/src/exception.cpp
index 82021dd..c7955b2 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -18,7 +18,7 @@
 
 */
 
-#include <exception>
+#include "exception"
 
 //We can't do this yet because gcc is too stupid to be able to handle
 //different implementations of exception class.
diff --git a/src/func_exception b/src/func_exception
index 1b7bdd8..9d525d4 100644
--- a/src/func_exception
+++ b/src/func_exception
@@ -17,8 +17,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <exception>
+#include "basic_definitions"
+#include "exception"
 
 
 #ifndef HEADER_IMPLEMENTATION_FUNC_EXCEPTION
diff --git a/src/func_exception.cpp b/src/func_exception.cpp
index fab095f..c295ba3 100644
--- a/src/func_exception.cpp
+++ b/src/func_exception.cpp
@@ -17,10 +17,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <exception>
-#include <func_exception>
-#include <stdexcept>
-#include <cstdlib>
+#include "exception"
+#include "func_exception"
+#include "stdexcept"
+#include "cstdlib"
 
 namespace std{
 
diff --git a/src/functional b/src/functional
index b7932e2..361e057 100644
--- a/src/functional
+++ b/src/functional
@@ -19,7 +19,7 @@
 #ifndef __STD_HEADER_FUNCTIONAL
 #define __STD_HEADER_FUNCTIONAL 1
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/iomanip b/src/iomanip
index 14a8260..f455773 100644
--- a/src/iomanip
+++ b/src/iomanip
@@ -17,8 +17,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <exception>
-#include <ios>
+#include "exception"
+#include "ios"
 
 #ifndef __STD_IOMANIP
 #define __STD_IOMANIP 1
diff --git a/src/iomanip.cpp b/src/iomanip.cpp
index c5e60cc..c35d256 100644
--- a/src/iomanip.cpp
+++ b/src/iomanip.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iomanip>
+#include "iomanip"
 
 namespace std{
 
diff --git a/src/ios b/src/ios
index 63dc4ed..d601187 100644
--- a/src/ios
+++ b/src/ios
@@ -17,10 +17,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <cstddef>
-#include <locale>
-#include <iosfwd>
+#include "basic_definitions"
+#include "cstddef"
+#include "locale"
+#include "iosfwd"
 
 #ifndef __HEADER_STD_IOS
 #define __HEADER_STD_IOS 1
diff --git a/src/ios.cpp b/src/ios.cpp
index 6d83cef..10d19b7 100644
--- a/src/ios.cpp
+++ b/src/ios.cpp
@@ -19,10 +19,10 @@
 
 #define __UCLIBCXX_COMPILE_IOS__ 1
 
-#include <ios>
-#include <ostream>
-#include <istream>
-#include <cstdio>
+#include "ios"
+#include "ostream"
+#include "istream"
+#include "cstdio"
 
 namespace std{
 
diff --git a/src/iosfwd b/src/iosfwd
index 2c14725..ff01335 100644
--- a/src/iosfwd
+++ b/src/iosfwd
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <char_traits>
-#include <memory>
+#include "basic_definitions"
+#include "char_traits"
+#include "memory"
 
 
 #ifndef __HEADER_STD_IOSFWD
diff --git a/src/iostream b/src/iostream
index 64b5f06..e95447b 100644
--- a/src/iostream
+++ b/src/iostream
@@ -17,16 +17,16 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef __HEADER_STD_IOSTREAM
 #define __HEADER_STD_IOSTREAM 1
 
-#include <iosfwd>
-#include <ios>
-#include <istream>
-#include <ostream>
-#include <string_iostream>
+#include "iosfwd"
+#include "ios"
+#include "istream"
+#include "ostream"
+#include "string_iostream"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/iostream.cpp b/src/iostream.cpp
index 7a190a2..a7e3266 100644
--- a/src/iostream.cpp
+++ b/src/iostream.cpp
@@ -19,7 +19,7 @@
 
 #define __UCLIBCXX_COMPILE_IOSTREAM__ 1
 
-#include <iostream>
+#include "iostream"
 
 namespace std{
 
diff --git a/src/istream b/src/istream
index a6fe3de..af99999 100644
--- a/src/istream
+++ b/src/istream
@@ -17,11 +17,11 @@
 	USA.
 */
 
-#include <ios>
-#include <cctype>
-#include <streambuf>
-#include <istream_helpers>
-#include <ostream>
+#include "ios"
+#include "cctype"
+#include "streambuf"
+#include "istream_helpers"
+#include "ostream"
 
 #ifndef __STD_HEADER_ISTREAM
 #define __STD_HEADER_ISTREAM 1
diff --git a/src/istream.cpp b/src/istream.cpp
index 9e96139..81feed3 100644
--- a/src/istream.cpp
+++ b/src/istream.cpp
@@ -20,7 +20,7 @@
 
 #define __UCLIBCXX_COMPILE_ISTREAM__ 1
 
-#include <istream>
+#include "istream"
 
 
 namespace std{
diff --git a/src/istream_helpers b/src/istream_helpers
index baa8c2c..23bf3e1 100644
--- a/src/istream_helpers
+++ b/src/istream_helpers
@@ -17,10 +17,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <ios>
-#include <cctype>
+#include "ios"
+#include "cctype"
 
-#include <string>
+#include "string"
 
 #ifndef __STD_HEADER_ISTREAM_HELPERS
 #define __STD_HEADER_ISTREAM_HELPERS 1
diff --git a/src/iterator b/src/iterator
index d38fa1c..bcf90b7 100644
--- a/src/iterator
+++ b/src/iterator
@@ -17,11 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <iosfwd>
-#include <cstddef>
-#include <char_traits>
-#include <iterator_base>
+#include "basic_definitions"
+#include "iosfwd"
+#include "cstddef"
+#include "char_traits"
+#include "iterator_base"
 
 
 
diff --git a/src/iterator.cpp b/src/iterator.cpp
index 2e21517..517a1d2 100644
--- a/src/iterator.cpp
+++ b/src/iterator.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iterator>
+#include "iterator"
 
 namespace std{
 
diff --git a/src/iterator_base b/src/iterator_base
index 1cae589..333cbf8 100644
--- a/src/iterator_base
+++ b/src/iterator_base
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef __STD_HEADER_ITERATOR_BASE
 #define __STD_HEADER_ITERATOR_BASE 1
diff --git a/src/limits b/src/limits
index e275eb5..4747f82 100644
--- a/src/limits
+++ b/src/limits
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <climits>
+#include "climits"
 
 #ifndef __STD_HEADER_LIMITS
 #define __STD_HEADER_LIMITS 1
diff --git a/src/limits.cpp b/src/limits.cpp
index 0fd42d5..7f0f226 100644
--- a/src/limits.cpp
+++ b/src/limits.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include <limits>
+#include "limits"
 
 namespace std{
 
diff --git a/src/list b/src/list
index 04afa2d..782f92d 100644
--- a/src/list
+++ b/src/list
@@ -17,10 +17,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <memory>
-#include <iterator>
-#include <algorithm>
-#include <initializer_list>
+#include "memory"
+#include "iterator"
+#include "algorithm"
+#include "initializer_list"
 
 #ifndef __STD_HEADER_LIST
 #define __STD_HEADER_LIST 1
diff --git a/src/list.cpp b/src/list.cpp
index cfc44e0..716d839 100644
--- a/src/list.cpp
+++ b/src/list.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <list>
+#include "list"
 
 namespace std{
 
diff --git a/src/locale b/src/locale
index 96e6bc9..cbe0628 100644
--- a/src/locale
+++ b/src/locale
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <cstddef>
-#include <string>
+#include "basic_definitions"
+#include "cstddef"
+#include "string"
 
 #ifndef __HEADER_STD_LOCALE
 #define __HEADER_STD_LOCALE 1
diff --git a/src/locale.cpp b/src/locale.cpp
index bc41792..bca1e20 100644
--- a/src/locale.cpp
+++ b/src/locale.cpp
@@ -17,11 +17,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <locale>
-#include <cstring>
-#include <string>
-#include <stdexcept>
-#include <cctype>
+#include "locale"
+#include "cstring"
+#include "string"
+#include "stdexcept"
+#include "cctype"
 
 namespace std{
 
diff --git a/src/map b/src/map
index 44be710..2809ec9 100644
--- a/src/map
+++ b/src/map
@@ -18,11 +18,11 @@
 
 
 
-#include <memory>
-#include <utility>
-#include <iterator>
-#include <associative_base>
-#include <initializer_list>
+#include "memory"
+#include "utility"
+#include "iterator"
+#include "associative_base"
+#include "initializer_list"
 
 
 #ifndef __STD_HEADER_MAP
diff --git a/src/map.cpp b/src/map.cpp
index 06e56a0..7fd96bd 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include <map>
+#include "map"
 
 namespace std{
 
diff --git a/src/memory b/src/memory
index 2a7ce8c..5db1671 100644
--- a/src/memory
+++ b/src/memory
@@ -17,12 +17,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <new>
-#include <cstddef>
-#include <cstdlib>
-#include <iterator_base>
-#include <utility>
-#include <cstdio>
+#include "new"
+#include "cstddef"
+#include "cstdlib"
+#include "iterator_base"
+#include "utility"
+#include "cstdio"
 
 #ifndef HEADER_STD_MEMORY
 #define HEADER_STD_MEMORY 1
diff --git a/src/new b/src/new
index 12b52a4..f353f06 100644
--- a/src/new
+++ b/src/new
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <exception>
-#include <cstddef>
+#include "basic_definitions"
+#include "exception"
+#include "cstddef"
 
 #ifndef __STD_NEW_OPERATOR
 #define __STD_NEW_OPERATOR 1
diff --git a/src/new_handler.cpp b/src/new_handler.cpp
index 1d85ee3..5a82e66 100644
--- a/src/new_handler.cpp
+++ b/src/new_handler.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <new>
+#include "new"
 
 const std::nothrow_t std::nothrow = { };
 
diff --git a/src/new_opnt.cpp b/src/new_opnt.cpp
index cffce61..30fc4c7 100644
--- a/src/new_opnt.cpp
+++ b/src/new_opnt.cpp
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <new>
-#include <cstdlib>
-#include <func_exception>
+#include "new"
+#include "cstdlib"
+#include "func_exception"
 
 #ifndef NO_NOTHROW
 _UCXXEXPORT void* operator new(std::size_t numBytes, const std::nothrow_t& ) throw(){
diff --git a/src/new_opvnt.cpp b/src/new_opvnt.cpp
index 3ea592a..3061199 100644
--- a/src/new_opvnt.cpp
+++ b/src/new_opvnt.cpp
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <new>
-#include <cstdlib>
-#include <func_exception>
+#include "new"
+#include "cstdlib"
+#include "func_exception"
 
 #ifndef NO_NOTHROW
 _UCXXEXPORT void* operator new[](std::size_t numBytes, const std::nothrow_t& ) throw(){
diff --git a/src/numeric b/src/numeric
index 25d1b27..c980eed 100644
--- a/src/numeric
+++ b/src/numeric
@@ -17,8 +17,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <exception>
+#include "basic_definitions"
+#include "exception"
 
 #ifndef __STD_NUMERIC_HEADER
 #define __STD_NUMERIC_HEADER 1
diff --git a/src/numeric.cpp b/src/numeric.cpp
index eb93f2e..aa6b8bd 100644
--- a/src/numeric.cpp
+++ b/src/numeric.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <numeric>
+#include "numeric"
 
 namespace std{
 
diff --git a/src/ostream b/src/ostream
index b112e94..31673df 100644
--- a/src/ostream
+++ b/src/ostream
@@ -17,15 +17,15 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef STD_HEADER_OSTREAM
 #define STD_HEADER_OSTREAM 1
 
-#include <iosfwd>
-#include <streambuf>
-#include <cstdio>
-#include <ostream_helpers>
+#include "iosfwd"
+#include "streambuf"
+#include "cstdio"
+#include "ostream_helpers"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/ostream.cpp b/src/ostream.cpp
index 0973871..6204769 100644
--- a/src/ostream.cpp
+++ b/src/ostream.cpp
@@ -19,7 +19,7 @@
 
 #define __UCLIBCXX_COMPILE_OSTREAM__ 1
 
-#include <ostream>
+#include "ostream"
 
 namespace std{
 	
diff --git a/src/ostream_helpers b/src/ostream_helpers
index 813f573..ef4c95e 100644
--- a/src/ostream_helpers
+++ b/src/ostream_helpers
@@ -18,11 +18,11 @@
 */
 
 #include <stdint.h>
-#include <basic_definitions>
-#include <cstddef>
-#include <ios>
-#include <cctype>
-#include <string>
+#include "basic_definitions"
+#include "cstddef"
+#include "ios"
+#include "cctype"
+#include "string"
 #include <math.h> // for floor()
 
 #ifndef __STD_HEADER_OSTREAM_HELPERS
diff --git a/src/ostream_helpers.cpp b/src/ostream_helpers.cpp
index 004ce6f..68499f0 100644
--- a/src/ostream_helpers.cpp
+++ b/src/ostream_helpers.cpp
@@ -6,7 +6,7 @@
  * 
  */
 
-#include <ostream_helpers>
+#include "ostream_helpers"
 #include <stdio.h>
 
 namespace std {
diff --git a/src/queue b/src/queue
index b817b1d..26f1781 100644
--- a/src/queue
+++ b/src/queue
@@ -15,10 +15,10 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <deque>
-#include <vector>
-#include <functional>
+#include "basic_definitions"
+#include "deque"
+#include "vector"
+#include "functional"
 
 #ifndef __HEADER_STD_QUEUE
 #define __HEADER_STD_QUEUE 1
diff --git a/src/queue.cpp b/src/queue.cpp
index 356efeb..99eaede 100644
--- a/src/queue.cpp
+++ b/src/queue.cpp
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <queue>
+#include "queue"
 
 
 namespace std{
diff --git a/src/serstream b/src/serstream
index b6eb7bd..a09a727 100644
--- a/src/serstream
+++ b/src/serstream
@@ -43,13 +43,13 @@
 #ifndef __810370EC_AD69_4ef7_91F5_B1AA16F14712
 #define __810370EC_AD69_4ef7_91F5_B1AA16F14712
 
-#include <basic_definitions>
+#include "basic_definitions"
 
-#include <iosfwd>
-#include <ios>
-#include <istream>
-#include <ostream>
-#include <iostream>
+#include "iosfwd"
+#include "ios"
+#include "istream"
+#include "ostream"
+#include "iostream"
 #include <Stream.h>
 
 namespace std
diff --git a/src/set b/src/set
index f376e47..3da7af1 100644
--- a/src/set
+++ b/src/set
@@ -18,12 +18,12 @@
 
 
 
-#include<memory>
-#include<utility>
-#include<iterator>
-#include <deque>
-#include<functional>
-#include <associative_base>
+#include "memory"
+#include "utility"
+#include "iterator"
+#include "deque"
+#include "functional"
+#include "associative_base"
 
 #ifndef __STD_HEADER_SET
 #define __STD_HEADER_SET
diff --git a/src/set.cpp b/src/set.cpp
index 61ec56a..251de50 100644
--- a/src/set.cpp
+++ b/src/set.cpp
@@ -17,7 +17,7 @@
 
 */
 
-#include <set>
+#include "set"
 
 namespace std{
 
diff --git a/src/sstream b/src/sstream
index 2969853..f419c64 100644
--- a/src/sstream
+++ b/src/sstream
@@ -17,17 +17,17 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef HEADER_STD_SSTREAM
 #define HEADER_STD_SSTREAM 1
 
-#include <iosfwd>
-#include <ios>
-#include <istream>
-#include <ostream>
-#include <iostream>
-#include <string>
+#include "iosfwd"
+#include "ios"
+#include "istream"
+#include "ostream"
+#include "iostream"
+#include "string"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/sstream.cpp b/src/sstream.cpp
index e712b67..c8c30d4 100644
--- a/src/sstream.cpp
+++ b/src/sstream.cpp
@@ -19,7 +19,7 @@
 
 #define __UCLIBCXX_COMPILE_SSTREAM__ 1
 
-#include <sstream>
+#include "sstream"
 
 namespace std{
 
diff --git a/src/stack b/src/stack
index d4861b3..add7bfb 100644
--- a/src/stack
+++ b/src/stack
@@ -15,8 +15,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <deque>
+#include "basic_definitions"
+#include "deque"
 
 #ifndef __HEADER_STD_STACK
 #define __HEADER_STD_STACK 1
diff --git a/src/stack.cpp b/src/stack.cpp
index 53a21bb..4e37ba0 100644
--- a/src/stack.cpp
+++ b/src/stack.cpp
@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <stack>
+#include "stack"
 
 
 namespace std{
diff --git a/src/stdexcept b/src/stdexcept
index 7557f24..1e62afb 100644
--- a/src/stdexcept
+++ b/src/stdexcept
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <exception>
-#include <string>
+#include "basic_definitions"
+#include "exception"
+#include "string"
 
 #ifndef HEADER_STD_EXCEPTIONS
 #define HEADER_STD_EXCEPTIONS 1
diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp
index 90dccc7..85289d5 100644
--- a/src/stdexcept.cpp
+++ b/src/stdexcept.cpp
@@ -17,8 +17,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <exception>
-#include <stdexcept>
+#include "exception"
+#include "stdexcept"
 
 #ifdef __UCLIBCXX_EXCEPTION_SUPPORT__
 
diff --git a/src/streambuf b/src/streambuf
index 0daa388..b2481ca 100644
--- a/src/streambuf
+++ b/src/streambuf
@@ -17,15 +17,15 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <locale>
-#include <string>
-#include <iosfwd>
+#include "basic_definitions"
+#include "locale"
+#include "string"
+#include "iosfwd"
 
 #ifndef HEADER_STD_STREAMBUF
 #define HEADER_STD_STREAMBUF 1
 
-#include <ios>
+#include "ios"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/streambuf.cpp b/src/streambuf.cpp
index 5417324..1647b60 100644
--- a/src/streambuf.cpp
+++ b/src/streambuf.cpp
@@ -19,7 +19,7 @@
 
 #define __UCLIBCXX_COMPILE_STREAMBUF__ 1
 
-#include <streambuf>
+#include "streambuf"
 
 namespace std{
 
diff --git a/src/string b/src/string
index d22f051..fa974c9 100644
--- a/src/string
+++ b/src/string
@@ -17,17 +17,17 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
-#include <char_traits>
+#include "basic_definitions"
+#include "char_traits"
 #include <string.h>
-#include <func_exception>
-#include <memory>
-#include <vector>
+#include "func_exception"
+#include "memory"
+#include "vector"
 
 
 #ifdef __UCLIBCXX_HAS_WCHAR__
-#include <cwchar>
-#include <cwctype>
+#include "cwchar"
+#include "cwctype"
 #endif
 
 #ifndef __HEADER_STD_STRING
diff --git a/src/string.cpp b/src/string.cpp
index 1edf69b..73c3eb6 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -19,12 +19,12 @@
 
 #define __UCLIBCXX_COMPILE_STRING__ 1
 
-#include <basic_definitions>
-#include <char_traits>
-#include <string>
-#include <string_iostream>
+#include "basic_definitions"
+#include "char_traits"
+#include "string"
+#include "string_iostream"
 #include <string.h>
-#include <ostream>
+#include "ostream"
 
 namespace std{
 
diff --git a/src/string_iostream b/src/string_iostream
index 355fd58..ebbe65d 100644
--- a/src/string_iostream
+++ b/src/string_iostream
@@ -17,13 +17,13 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <istream>
-#include <ostream>
-#include <string>
+#include "istream"
+#include "ostream"
+#include "string"
 
 #ifdef __UCLIBCXX_HAS_WCHAR__
-#include <cwchar>
-#include <cwctype>
+#include "cwchar"
+#include "cwctype"
 #endif
 
 #ifndef __HEADER_STD_STRING_IOSTREAM
diff --git a/src/support b/src/support
index 9279987..1c06faf 100644
--- a/src/support
+++ b/src/support
@@ -17,9 +17,9 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <exception>
-#include <cstdlib>
-#include <typeinfo>
+#include "exception"
+#include "cstdlib"
+#include "typeinfo"
 
 #ifndef HEADER_ULC_SUPPORT
 #define HEADER_ULC_SUPPORT 1
diff --git a/src/support.cpp b/src/support.cpp
index 1ec0264..24989e1 100644
--- a/src/support.cpp
+++ b/src/support.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <support>
+#include "support"
 
 /*extern "C" void *__cxa_allocate_exception(size_t thrown_size){
 	void * retval;
diff --git a/src/type_traits b/src/type_traits
index fa1de40..b97950f 100644
--- a/src/type_traits
+++ b/src/type_traits
@@ -16,11 +16,11 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 #include <string.h>
-#include <exception>
-#include <memory>
-#include <char_traits>
+#include "exception"
+#include "memory"
+#include "char_traits"
 
 #ifndef __HEADER_TYPE_TRAITS
 #define __HEADER_TYPE_TRAITS 1
diff --git a/src/typeinfo b/src/typeinfo
index 88a2639..17d7b04 100644
--- a/src/typeinfo
+++ b/src/typeinfo
@@ -35,7 +35,7 @@
 #ifndef __TYPEINFO__
 #define __TYPEINFO__
 
-#include <exception>
+#include "exception"
 
 extern "C++" {
 
diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp
index b8ea301..ef9dad8 100644
--- a/src/typeinfo.cpp
+++ b/src/typeinfo.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <typeinfo>
+#include "typeinfo"
 
 namespace std{
 
diff --git a/src/unwind-cxx.h b/src/unwind-cxx.h
index e001343..e8a5b24 100644
--- a/src/unwind-cxx.h
+++ b/src/unwind-cxx.h
@@ -35,9 +35,9 @@
 
 // Level 2: C++ ABI
 
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
+#include "typeinfo"
+#include "exception"
+#include "cstddef"
 #include "unwind.h"
 
 #ifdef __aarch64__
diff --git a/src/utility b/src/utility
index 0da354e..8e7081d 100644
--- a/src/utility
+++ b/src/utility
@@ -18,7 +18,7 @@
 */
 
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 
 #ifndef __STD_HEADER_UTILITY
diff --git a/src/utility.cpp b/src/utility.cpp
index b2f8995..6b792a6 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <utility>
+#include "utility"
 
 
 namespace std{
diff --git a/src/valarray b/src/valarray
index 09d929c..316c90e 100644
--- a/src/valarray
+++ b/src/valarray
@@ -17,13 +17,13 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <basic_definitions>
+#include "basic_definitions"
 
 #ifndef __HEADER_STD_VALARRAY
 #define __HEADER_STD_VALARRAY 1
 
-#include <cstddef>
-#include <cmath>
+#include "cstddef"
+#include "cmath"
 
 #pragma GCC visibility push(default)
 
diff --git a/src/valarray.cpp b/src/valarray.cpp
index e4bd504..c0c2c1a 100644
--- a/src/valarray.cpp
+++ b/src/valarray.cpp
@@ -17,7 +17,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <valarray>
+#include "valarray"
 
 namespace std{
 
diff --git a/src/vector b/src/vector
index f8cb410..78a6c5d 100644
--- a/src/vector
+++ b/src/vector
@@ -18,13 +18,13 @@
 
 */
 
-#include <basic_definitions>
-#include <memory>
-#include <iterator>
-#include <func_exception>
-#include <algorithm>
-#include <type_traits>
-#include <initializer_list>
+#include "basic_definitions"
+#include "memory"
+#include "iterator"
+#include "func_exception"
+#include "algorithm"
+#include "type_traits"
+#include "initializer_list"
 
 #ifndef __STD_HEADER_VECTOR
 #define __STD_HEADER_VECTOR
diff --git a/src/vector.cpp b/src/vector.cpp
index 5ee0de1..224d0cb 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -20,7 +20,7 @@
 #define __UCLIBCXX_COMPILE_VECTOR__ 1
 
 
-#include <vector>
+#include "vector"
 
 namespace std{