diff --git a/src/Graphics/Graphics.cpp b/src/Graphics/Graphics.cpp
index 39202c9..ac32560 100644
--- a/src/Graphics/Graphics.cpp
+++ b/src/Graphics/Graphics.cpp
@@ -235,16 +235,6 @@ Ptr GetPixBaseAddr(PixMapHandle pm)
 	return (Ptr) GetImpl(*pm).data.data();
 }
 
-Boolean LockPixels(PixMapHandle pm)
-{
-	return true;
-}
-
-void UnlockPixels(PixMapHandle pm)
-{
-	// no-op
-}
-
 // ---------------------------------------------------------------------------- -
 // Port
 
diff --git a/src/Memory/Memory.cpp b/src/Memory/Memory.cpp
index 6ab5032..20420b7 100644
--- a/src/Memory/Memory.cpp
+++ b/src/Memory/Memory.cpp
@@ -127,67 +127,3 @@ void BlockMoveData(const void* srcPtr, void* destPtr, Size byteCount)
 {
 	TODOFATAL();
 }
-
-//-----------------------------------------------------------------------------
-// No-op memory junk
-
-void MaxApplZone(void)
-{
-	// No-op
-}
-
-void MoreMasters(void)
-{
-	// No-op
-}
-
-Size CompactMem(Size)
-{
-	// No-op
-	// TODO: what should we actually return?
-	return 0;
-}
-
-Size CompactMemSys(Size)
-{
-	// No-op
-	// TODO: what should we actually return?
-	return 0;
-}
-
-void PurgeMem(Size)
-{
-	// No-op
-}
-
-void PurgeMemSys(Size)
-{
-	// No-op
-}
-
-Size MaxMem(Size*)
-{
-	// No-op
-	// TODO: what should we actually return?
-	return 0;
-}
-
-void HNoPurge(Handle)
-{
-	// No-op
-}
-
-void HLock(Handle)
-{
-	// No-op
-}
-
-void HLockHi(Handle)
-{
-	// No-op
-}
-
-void NoPurgePixels(PixMapHandle)
-{
-	// No-op
-}
diff --git a/src/Pomme.h b/src/Pomme.h
index 41c9a2d..99aa703 100644
--- a/src/Pomme.h
+++ b/src/Pomme.h
@@ -280,32 +280,53 @@ Boolean Button(void);
 //-----------------------------------------------------------------------------
 // Memory: No-op
 
-void MaxApplZone(void);
+// No-op in Pomme.
+static inline void MaxApplZone(void) {}
 
-void MoreMasters(void);
+// No-op in Pomme.
+static inline void MoreMasters(void) {}
 
-Size CompactMem(Size);
+// No-op in Pomme.
+static inline Size CompactMem(Size size) { return size; }
 
+// No-op in Pomme.
 // Compact system heap zone manually.
-Size CompactMemSys(Size);
+static inline Size CompactMemSys(Size size) { return size; }
 
-void PurgeMem(Size);
+// No-op in Pomme.
+static inline void PurgeMem(Size size) {}
 
-void PurgeMemSys(Size);
+// No-op in Pomme.
+static inline void PurgeMemSys(Size size) {}
 
-Size MaxMem(Size* grow);
+// No-op in Pomme.
+// TODO: do something about `grow` and return a large integer to make it look like we have tons of memory.
+static inline Size MaxMem(Size* grow) { return 0; }
 
-void HNoPurge(Handle);
+// No-op in Pomme.
+static inline void HNoPurge(Handle handle) {}	// no-op
 
-void HLock(Handle);
+// No-op in Pomme.
+static inline void HLock(Handle handle) {}	// no-op
 
-void HLockHi(Handle);
+// No-op in Pomme.
+static inline void HLockHi(Handle handle) {}	// no-op
 
-void NoPurgePixels(PixMapHandle);
+// No-op in Pomme.
+static inline void HUnlock(Handle handle) {}	// no-op
 
+// No-op in Pomme.
+static inline void NoPurgePixels(PixMapHandle handle) {}	// no-op
+
+// No-op in Pomme.
 // To prevent the base address for an offscreen pixel image from being moved
 // while you draw into or copy from its pixel map.
-Boolean LockPixels(PixMapHandle); // shall return true always
+static inline Boolean LockPixels(PixMapHandle handle) { return true; }	// no-op; shall always return true
+
+// No-op in Pomme.
+// If the Memory Manager started up in 24-bit mode, strips flag bits from 24-bit memory addresses;
+// otherwise (in 32-bit mode), returns the address unchanged.
+static inline Ptr StripAddress(Ptr ptr) { return ptr; }  // no-op
 
 //-----------------------------------------------------------------------------
 // Memory: Handle