diff --git a/include/media/stagefright/TimeSource.h b/include/media/stagefright/TimeSource.h
index f57d8cf..443673de4 100644
--- a/include/media/stagefright/TimeSource.h
+++ b/include/media/stagefright/TimeSource.h
@@ -18,6 +18,8 @@
 
 #define TIME_SOURCE_H_
 
+#include <stdint.h>
+
 namespace android {
 
 class TimeSource {
diff --git a/media/libstagefright/TimeSource.cpp b/media/libstagefright/TimeSource.cpp
index 7deb310..d987fbf 100644
--- a/media/libstagefright/TimeSource.cpp
+++ b/media/libstagefright/TimeSource.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <stddef.h>
 #include <sys/time.h>
 
 #include <media/stagefright/TimeSource.h>
diff --git a/media/libstagefright/TimedEventQueue.cpp b/media/libstagefright/TimedEventQueue.cpp
index 10cf81a..2f8a19f 100644
--- a/media/libstagefright/TimedEventQueue.cpp
+++ b/media/libstagefright/TimedEventQueue.cpp
@@ -16,6 +16,7 @@
 
 #undef __STRICT_ANSI__
 #define __STDINT_LIMITS
+#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #define LOG_TAG "TimedEventQueue"