Enable annotation of library imports.

platform-independent/c/core/src/aes.c

@@ -37,9 +37,11 @@ NOTE:   String length must be evenly divisible by 16byte (str_len % 16 == 0)
 /*****************************************************************************/
 /* Includes:                                                                 */
 /*****************************************************************************/
-#include <string.h>
 #include "aes.h"
-#include "mpw-util.h"
+
+MP_LIBS_BEGIN
+#include <string.h>
+MP_LIBS_END
 
 /*****************************************************************************/
 /* Defines:                                                                  */

platform-independent/c/core/src/aes.h

@@ -9,7 +9,11 @@ This is an implementation of the AES algorithm, specifically ECB and CBC mode.
 #ifndef _AES_H_
 #define _AES_H_
 
+#include "mpw-util.h"
+
+MP_LIBS_BEGIN
 #include <stdint.h>
+MP_LIBS_END
 
 
 // #define the macros below to 1/0 to enable/disable the mode of operation.

platform-independent/c/core/src/base64.h

@@ -54,8 +54,12 @@
 * project, please see <http://www.apache.org/>.
 */
 
+#include "mpw-util.h"
+
+MP_LIBS_BEGIN
 #include <stddef.h>
 #include <stdint.h>
+MP_LIBS_END
 
 /**
  * @return The amount of bytes needed to decode the given b64Text.

platform-independent/c/core/src/mpw-algorithm.h

@@ -16,12 +16,11 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-// NOTE: mpw is currently NOT thread-safe.
-#include "mpw-types.h"
-
 #ifndef _MPW_ALGORITHM_H
 #define _MPW_ALGORITHM_H
 
+#include "mpw-types.h"
+
 typedef mpw_enum( unsigned int, MPAlgorithmVersion ) {
     /** V0 did math with chars whose signedness was platform-dependent. */
             MPAlgorithmVersion0,

platform-independent/c/core/src/mpw-algorithm_v0.c

@@ -16,12 +16,14 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#include "mpw-util.h"
+#include "base64.h"
+
+MP_LIBS_BEGIN
 #include <string.h>
 #include <errno.h>
 #include <time.h>
-
+MP_LIBS_END
-#include "mpw-util.h"
-#include "base64.h"
 
 #define MP_N                32768LU
 #define MP_r                8U

platform-independent/c/core/src/mpw-algorithm_v1.c

@@ -16,10 +16,12 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include <string.h>
-
 #include "mpw-util.h"
 
+MP_LIBS_BEGIN
+#include <string.h>
+MP_LIBS_END
+
 #define MP_N                32768LU
 #define MP_r                8U
 #define MP_p                2U

platform-independent/c/core/src/mpw-algorithm_v2.c

@@ -16,11 +16,13 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#include "mpw-util.h"
+
+MP_LIBS_BEGIN
 #include <string.h>
 #include <errno.h>
 #include <time.h>
-
+MP_LIBS_END
-#include "mpw-util.h"
 
 #define MP_N                32768LU
 #define MP_r                8U

platform-independent/c/core/src/mpw-algorithm_v3.c

@@ -16,10 +16,12 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#include "mpw-util.h"
+
+MP_LIBS_BEGIN
 #include <string.h>
 #include <errno.h>
-
+MP_LIBS_END
-#include "mpw-util.h"
 
 #define MP_N                32768LU
 #define MP_r                8U

platform-independent/c/core/src/mpw-marshal-util.c

@@ -16,11 +16,13 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include <string.h>
-
 #include "mpw-marshal-util.h"
 #include "mpw-util.h"
 
+MP_LIBS_BEGIN
+#include <string.h>
+MP_LIBS_END
+
 char *mpw_get_token(const char **in, const char *eol, char *delim) {
 
     // Skip leading spaces.

platform-independent/c/core/src/mpw-marshal-util.h

@@ -19,12 +19,14 @@
 #ifndef _MPW_MARSHAL_UTIL_H
 #define _MPW_MARSHAL_UTIL_H
 
+#include "mpw-algorithm.h"
+
+MP_LIBS_BEGIN
 #include <time.h>
 #if MPW_JSON
-#include "json-c/json.h"
+#include <json-c/json.h>
 #endif
-
+MP_LIBS_END
-#include "mpw-algorithm.h"
 
 /// Type parsing.
 

platform-independent/c/core/src/mpw-marshal.c

@@ -17,14 +17,16 @@
 //==============================================================================
 
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "mpw-marshal.h"
 #include "mpw-util.h"
 #include "mpw-marshal-util.h"
 
+MP_LIBS_BEGIN
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+MP_LIBS_END
+
 MPMarshalledUser *mpw_marshal_user(
         const char *fullName, MPMasterKeyProvider masterKeyProvider, const MPAlgorithmVersion algorithmVersion) {
 

platform-independent/c/core/src/mpw-marshal.h

@@ -19,10 +19,12 @@
 #ifndef _MPW_MARSHAL_H
 #define _MPW_MARSHAL_H
 
-#include <time.h>
-
 #include "mpw-algorithm.h"
 
+MP_LIBS_BEGIN
+#include <time.h>
+MP_LIBS_END
+
 //// Types.
 
 typedef mpw_enum( unsigned int, MPMarshalFormat ) {

platform-independent/c/core/src/mpw-types.c

@@ -16,12 +16,14 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
-#include <string.h>
-#include <ctype.h>
-
 #include "mpw-types.h"
 #include "mpw-util.h"
 
+MP_LIBS_BEGIN
+#include <string.h>
+#include <ctype.h>
+MP_LIBS_END
+
 const size_t MPMasterKeySize = 64;
 const size_t MPSiteKeySize = 256 / 8; // Size of HMAC-SHA-256
 const MPIdenticon MPIdenticonUnset = {

platform-independent/c/core/src/mpw-types.h

@@ -19,9 +19,16 @@
 #ifndef _MPW_TYPES_H
 #define _MPW_TYPES_H
 
+#ifndef MP_LIBS_BEGIN
+#define MP_LIBS_BEGIN
+#define MP_LIBS_END
+#endif
+
+MP_LIBS_BEGIN
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
+MP_LIBS_END
 
 #ifdef NS_ENUM
 #define mpw_enum(_type, _name) NS_ENUM(_type, _name)

platform-independent/c/core/src/mpw-util.c

@@ -16,6 +16,9 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#include "mpw-util.h"
+
+MP_LIBS_BEGIN
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
@@ -29,8 +32,7 @@
 #define AES_ECB 0
 #define AES_CBC 1
 #include "aes.h"
-
+MP_LIBS_END
-#include "mpw-util.h"
 
 #ifdef inf_level
 int mpw_verbosity = inf_level;

platform-independent/c/core/src/mpw-util.h

@@ -19,10 +19,12 @@
 #ifndef _MPW_UTIL_H
 #define _MPW_UTIL_H
 
+#include "mpw-types.h"
+
+MP_LIBS_BEGIN
 #include <stdio.h>
 #include <stdarg.h>
-
+MP_LIBS_END
-#include "mpw-types.h"
 
 //// Logging.
 #ifndef trc