diff --git a/include/sys/types.h b/include/sys/types.h
index 9b26eeb..3ef3508 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -58,6 +58,23 @@
 
 typedef unsigned long time_t;
 typedef unsigned long long bigtime_t;
+typedef uint8_t uint8;
+typedef uint16_t uint16;
+typedef uint32_t uint32;
+typedef uint64_t uint64;
+typedef int     boolean;
+typedef int8_t int8;
+typedef int16_t int16;
+typedef int32_t int32;
+typedef bool boolean;
+
+#ifndef TRUE
+#define TRUE true
+#endif
+#ifndef FALSE
+#define FALSE false
+#endif
+
 #define INFINITE_TIME ULONG_MAX
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
diff --git a/platform/msm_shared/include/crypto_hash.h b/platform/msm_shared/include/crypto_hash.h
index 44e227a..4faca91 100644
--- a/platform/msm_shared/include/crypto_hash.h
+++ b/platform/msm_shared/include/crypto_hash.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -29,13 +29,12 @@
 #ifndef __CRYPTO_HASH_H__
 #define __CRYPYO_HASH_H__
 
+#include <sys/types.h>
+
 #ifndef NULL
 #define NULL		0
 #endif
 
-#define TRUE		1
-#define FALSE		0
-
 #define SHA256_INIT_VECTOR_SIZE		8
 #define SHA1_INIT_VECTOR_SIZE		5
 
diff --git a/platform/msm_shared/include/glink_os_type.h b/platform/msm_shared/include/glink_os_type.h
index 091ad05..a129372 100644
--- a/platform/msm_shared/include/glink_os_type.h
+++ b/platform/msm_shared/include/glink_os_type.h
@@ -40,6 +40,7 @@
                         INCLUDE FILES
 
 ===========================================================================*/
+#include <sys/types.h>
 #include <string.h>
 #include <assert.h>
 
@@ -55,13 +56,6 @@
 #define DALSYS_SYNC_OBJ_SIZE_BYTES           40
 #define DALSYS_EVENT_OBJ_SIZE_BYTES          80
 
-typedef bool boolean;
-typedef uint64_t uint64;
-typedef uint32_t uint32;
-typedef long int32;
-#define TRUE 1
-#define FALSE 0
-
 typedef struct DALSYSEventObj  DALSYSEventObj;
 
 struct DALSYSEventObj
diff --git a/platform/msm_shared/include/msm_panel.h b/platform/msm_shared/include/msm_panel.h
index 7a3b014..03c8ae9 100755
--- a/platform/msm_shared/include/msm_panel.h
+++ b/platform/msm_shared/include/msm_panel.h
@@ -30,12 +30,10 @@
 #ifndef _PLATFORM_MSM_SHARED_MSM_PANEL_H_
 #define _PLATFORM_MSM_SHARED_MSM_PANEL_H_
 
+#include <sys/types.h>
 #include <stdint.h>
 #include <dev/fbcon.h>
 
-#define TRUE	1
-#define FALSE	0
-
 #define DFPS_MAX_FRAME_RATE 10
 #define DFPS_PLL_CODES_SIZE 0x1000 /* One page */