diff --git a/include/gx2/enum.h b/include/gx2/enum.h
index cca8572..c0d2ef6 100644
--- a/include/gx2/enum.h
+++ b/include/gx2/enum.h
@@ -11,6 +11,11 @@
 extern "C" {
 #endif
 
+#define GX2_COMMAND_BUFFER_ALIGNMENT (0x40)
+#define GX2_CONTEXT_STATE_ALIGNMENT (0x100)
+#define GX2_SCAN_BUFFER_ALIGNMENT (0x1000)
+#define GX2_SHADER_PROGRAM_ALIGNMENT (0x100)
+
 typedef enum GX2AAMode
 {
    GX2_AA_MODE1X                          = 0,
diff --git a/include/gx2/event.h b/include/gx2/event.h
index 1355857..7810a8c 100644
--- a/include/gx2/event.h
+++ b/include/gx2/event.h
@@ -63,15 +63,15 @@ GX2GetRetiredTimeStamp();
 OSTime
 GX2GetLastSubmittedTimeStamp();
 
-BOOL
-GX2WaitTimeStamp(OSTime time);
-
 void
 GX2GetSwapStatus(uint32_t *swapCount,
                  uint32_t *flipCount,
                  OSTime *lastFlip,
                  OSTime *lastVsync);
 
+BOOL
+GX2WaitTimeStamp(OSTime time);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/gx2/shaders.h b/include/gx2/shaders.h
index 125fad2..11598b4 100644
--- a/include/gx2/shaders.h
+++ b/include/gx2/shaders.h
@@ -14,8 +14,6 @@
 extern "C" {
 #endif
 
-#define GX2_SHADER_PROGRAM_ALIGNMENT (0x100)
-
 typedef struct GX2AttribVar GX2AttribVar;
 typedef struct GX2AttribStream GX2AttribStream;
 typedef struct GX2FetchShader GX2FetchShader;