diff --git a/BBGE/Core.h b/BBGE/Core.h
index 40fe49b..743940d 100644
--- a/BBGE/Core.h
+++ b/BBGE/Core.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef CORE_H
-#define CORE_H
+#ifndef BBGE_CORE_H
+#define BBGE_CORE_H
 
 #include "Base.h"
 #include "RenderObject.h"
diff --git a/BBGE/Event.h b/BBGE/Event.h
index 5cf91b6..cca37f7 100644
--- a/BBGE/Event.h
+++ b/BBGE/Event.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef EVENT_H
-#define EVENT_H
+#ifndef BBGE_EVENT_H
+#define BBGE_EVENT_H
 
 #include <stdlib.h>
 
diff --git a/BBGE/Quad.h b/BBGE/Quad.h
index 6404f1f..3786d04 100644
--- a/BBGE/Quad.h
+++ b/BBGE/Quad.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef QUAD_H
-#define QUAD_H
+#ifndef BBGE_QUAD_H
+#define BBGE_QUAD_H
 
 #include "RenderObject.h"
 
diff --git a/BBGE/StateManager.h b/BBGE/StateManager.h
index 54e3c2c..485578b 100644
--- a/BBGE/StateManager.h
+++ b/BBGE/StateManager.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef STATE_DATA_H
-#define STATE_DATA_H
+#ifndef BBGE_STATE_DATA_H
+#define BBGE_STATE_DATA_H
 
 #include "Base.h"
 #include <map>
diff --git a/BBGE/Texture.cpp b/BBGE/Texture.cpp
index a1797b9..401ca5e 100644
--- a/BBGE/Texture.cpp
+++ b/BBGE/Texture.cpp
@@ -25,10 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "RenderBase.h"
 #include <assert.h>
 
-#if defined(BBGE_BUILD_UNIX)
-#include <stdint.h>
-#endif
-
 
 Texture::Texture()
 {
diff --git a/BBGE/Texture.h b/BBGE/Texture.h
index bef5f5a..1e9d6da 100644
--- a/BBGE/Texture.h
+++ b/BBGE/Texture.h
@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef TEXTURE_H
-#define TEXTURE_H
+#ifndef BBGE_TEXTURE_H
+#define BBGE_TEXTURE_H
 
 #include <string>
 #include "Refcounted.h"