diff --git a/etg/propgridiface.py b/etg/propgridiface.py
index afe048c3..847a0e05 100644
--- a/etg/propgridiface.py
+++ b/etg/propgridiface.py
@@ -49,10 +49,6 @@ def run():
     c.find('SetPropertyValue').findOverload('wxULongLong_t value').ignore()
     c.find('SetPropertyValue').findOverload('wxObject *value').ignore()
 
-    # TODO: Fix these
-    c.find('GetPropertyValueAsLongLong').ignore()
-    c.find('GetPropertyValueAsULongLong').ignore()
-
     module.addItem(
         tools.wxArrayPtrWrapperTemplate('wxArrayPGProperty', 'wxPGProperty', module))
 
diff --git a/etg/propgridprops.py b/etg/propgridprops.py
index 0f57f23d..cd137a7b 100644
--- a/etg/propgridprops.py
+++ b/etg/propgridprops.py
@@ -77,9 +77,6 @@ def run():
     c.briefDoc = "Basic property with integer value."
     c.detailedDoc = []
 
-    c.find('DoValidation.value').type = 'long long'
-
-
     c = module.find('wxLongStringProperty')
     c.find('OnButtonClick.value').inOut = True
     c.find('DisplayEditorDialog.value').inOut = True
diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py
index d5e44965..73d55f82 100644
--- a/etgtools/tweaker_tools.py
+++ b/etgtools/tweaker_tools.py
@@ -102,7 +102,6 @@ class FixWxPrefix(object):
         else:
             return name
 
-
     def _getCoreTopLevelNames(self):
         # Since the real wx.core module may not exist yet, and since actually
         # executing code at this point is probably a bad idea, try parsing the
diff --git a/src/longlong.sip b/src/longlong.sip
index 469f61da..0fe45ede 100644
--- a/src/longlong.sip
+++ b/src/longlong.sip
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------
 
-typedef long long wxLongLong_t;
-typedef unsigned long long wxULongLong_t;
+typedef long long wxLongLong_t /NoTypeName/;
+typedef unsigned long long wxULongLong_t /NoTypeName/;
 
 %MappedType wxLongLong {
 
diff --git a/src/wxpy_api.h b/src/wxpy_api.h
index 1d3b256c..666050a0 100644
--- a/src/wxpy_api.h
+++ b/src/wxpy_api.h
@@ -40,25 +40,6 @@
 
 #include <wx/wx.h>
 
-//--------------------------------------------------------------------------
-// TODO: find a way to not need to do this.
-// It is needed because SIP is putting :: on the front of the type, and when
-// it's a macro the compiler complains about "expected unqualified-id". The
-// risk is that it may be possible for wxLongLong_t to be a type that is not
-// actually fully compatible with "long long", causing problems when passing
-// into, or returning from wx APIs.
-
-// If they are macros then undef them and make some typedefs instead
-#ifdef wxLongLong_t
-#undef wxLongLong_t
-typedef long long wxLongLong_t;
-#endif
-
-#ifdef wxULongLong_t
-#undef wxULongLong_t
-typedef unsigned long long wxULongLong_t;
-#endif
-
 //--------------------------------------------------------------------------
 // The API items that can be inline functions or macros.
 // These are made available simply by #including this header file.