--- a/common.h	Wed Apr 24 20:33:06 2013 +0300
+++ b/common.h	Wed Apr 24 23:27:36 2013 +0300
@@ -16,8 +16,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __COMMON_H__
-#define __COMMON_H__
+#ifndef COMMON_H
+#define COMMON_H
 
 #define APPNAME "ldforge"
 #define APPNAME_DISPLAY "LDForge"
@@ -70,8 +70,6 @@
 static const short dMainColor = 16;
 static const short dEdgeColor = 24;
 
-using std::vector;
-
 class ForgeWindow;
 class LDObject;
 class bbox;
@@ -152,18 +150,4 @@
 // Identity matrix
 extern const matrix g_mIdentity;
 
-typedef unsigned int uint;
-typedef short unsigned int ushort;
-typedef long unsigned int ulong;
-
-// Typedef out the _t suffices :)
-typedef int8_t int8;
-typedef int16_t int16;
-typedef int32_t int32;
-typedef int64_t int64;
-typedef uint8_t uint8;
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-
-#endif
\ No newline at end of file
+#endif // COMMON_H
\ No newline at end of file