diff --git a/src/BizHawk.Bizware.Input/KeyMouseInput/X11KeyMouseInput.cs b/src/BizHawk.Bizware.Input/KeyMouseInput/X11KeyMouseInput.cs
index 3b12eed679..5efd2f5f24 100644
--- a/src/BizHawk.Bizware.Input/KeyMouseInput/X11KeyMouseInput.cs
+++ b/src/BizHawk.Bizware.Input/KeyMouseInput/X11KeyMouseInput.cs
@@ -293,7 +293,7 @@ namespace BizHawk.Bizware.Input
 				}
 			}
 
-			for (var i = 0; i < KeyEnumMap.Length; i++)
+			for (uint i = 0; i < KeyEnumMap.Length; i++)
 			{
 				if (KeyEnumMap[i] == DistinctKey.Unknown)
 				{
diff --git a/src/BizHawk.Common/LSB/XFixesImports.cs b/src/BizHawk.Common/LSB/XFixesImports.cs
index 4e4e6d3c9f..e2cbb464ee 100644
--- a/src/BizHawk.Common/LSB/XFixesImports.cs
+++ b/src/BizHawk.Common/LSB/XFixesImports.cs
@@ -14,6 +14,7 @@ namespace BizHawk.Common
 		[Flags]
 		public enum BarrierDirection : int
 		{
+			BarrierNone = 0,
 			BarrierPositiveX = 1 << 0,
 			BarrierPositiveY = 1 << 1,
 			BarrierNegativeX = 1 << 2,
diff --git a/src/BizHawk.Common/LSB/XInput2Imports.cs b/src/BizHawk.Common/LSB/XInput2Imports.cs
index a8febefbac..d0f5a691f3 100644
--- a/src/BizHawk.Common/LSB/XInput2Imports.cs
+++ b/src/BizHawk.Common/LSB/XInput2Imports.cs
@@ -88,7 +88,7 @@ namespace BizHawk.Common
 		{
 			public int type;
 			public nuint serial;
-			public int send_event;
+			public int send_event; // Bool
 			public IntPtr display;
 			public int extension;
 			public int evtype;
diff --git a/src/BizHawk.Common/LSB/XlibImports.cs b/src/BizHawk.Common/LSB/XlibImports.cs
index db4be5b4cd..50fb940891 100644
--- a/src/BizHawk.Common/LSB/XlibImports.cs
+++ b/src/BizHawk.Common/LSB/XlibImports.cs
@@ -630,8 +630,8 @@ namespace BizHawk.Common
 			public nuint time;
 			public int x, y;
 			public int x_root, y_root;
-			public int state;
-			public int keycode;
+			public uint state;
+			public uint keycode;
 			[MarshalAs(UnmanagedType.Bool)]
 			public bool same_screen;
 		}
@@ -707,12 +707,13 @@ namespace BizHawk.Common
 		public static extern unsafe XkbDescRec* XkbAllocKeyboard(IntPtr display);
 
 		[DllImport(XLIB)]
-		public static extern unsafe void XkbFreeKeyboard(XkbDescRec* xkb, int which, [MarshalAs(UnmanagedType.Bool)] bool free_all);
+		public static extern unsafe void XkbFreeKeyboard(XkbDescRec* xkb, uint which, [MarshalAs(UnmanagedType.Bool)] bool free_all);
 
 		[DllImport(XLIB)]
 		public static extern unsafe Status XkbGetNames(IntPtr display, uint which, XkbDescRec* xkb);
 
 		[DllImport(XLIB)]
-		public static extern Keysym XkbKeycodeToKeysym(IntPtr display, int keycode, int group, int level);
+		[return: MarshalAs(UnmanagedType.SysUInt)]
+		public static extern Keysym XkbKeycodeToKeysym(IntPtr display, uint keycode, int group, int level);
 	}
 }