Cleaning up include structure.

aentinger · aentinger · commit f9e85405a4c0 · 2021-01-27T09:52:55.000+01:00
diff --git a/src/cbor/CBORDecoder.h b/src/cbor/CBORDecoder.h
@@ -21,9 +21,11 @@
 /******************************************************************************
    INCLUDE
  ******************************************************************************/
-#ifdef __AVR__
+
 #include <Arduino.h>
-#include <Arduino_AVRSTL.h>
+
+#ifdef __AVR__
+# include <Arduino_AVRSTL.h>
 #endif
 
 #undef max
diff --git a/src/cbor/CBOREncoder.h b/src/cbor/CBOREncoder.h
@@ -22,11 +22,16 @@
  * INCLUDE
  ******************************************************************************/
 
-#ifdef __AVR__
 #include <Arduino.h>
-#include <Arduino_AVRSTL.h>
+
+#ifdef __AVR__
+# include <Arduino_AVRSTL.h>
 #endif
 
+#undef max
+#undef min
+#include <list>
+
 #include "../property/PropertyContainer.h"
 
 /******************************************************************************
diff --git a/src/property/Property.h b/src/property/Property.h
@@ -28,11 +28,18 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-// in order to allow <functional> to define its own max and min functions
+
 #undef max
 #undef min
+
+#ifdef __AVR__
+# include <Arduino_AVRSTL.h>
+# include <nonstd/nonstd.h>
+#else
+# include <functional>
+#endif
+
 #include <list>
-#include <functional>
 
 #include "../cbor/lib/tinycbor/cbor-lib.h"
 
diff --git a/src/property/PropertyContainer.h b/src/property/PropertyContainer.h
@@ -22,8 +22,14 @@
    INCLUDE
  ******************************************************************************/
 
+#include <Arduino.h>
+
 #include "Property.h"
 
+#ifdef __AVR__
+# include <Arduino_AVRSTL.h>
+#endif
+
 #undef max
 #undef min
 #include <list>
